From 226ecaf9a237bc760145a8e2e04241a1f6ee15dc Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 24 Sep 2021 21:01:13 +0200 Subject: [PATCH] win32: Don't include gdkinternals.h --- gdk/win32/gdkclipboard-win32.c | 1 + gdk/win32/gdkclipdrop-win32.c | 9 ++++++--- gdk/win32/gdkdevicemanager-win32.c | 1 + gdk/win32/gdkdisplaymanager-win32.c | 1 - gdk/win32/gdkdrag-win32.c | 9 ++++++--- gdk/win32/gdkdrop-win32.c | 1 - gdk/win32/gdkevents-win32.c | 7 ++++--- gdk/win32/gdkglcontext-win32-egl.c | 1 - gdk/win32/gdkglcontext-win32-wgl.c | 1 - gdk/win32/gdkglcontext-win32.c | 1 - gdk/win32/gdkglcontext-win32.h | 1 - gdk/win32/gdkhdataoutputstream-win32.c | 1 - gdk/win32/gdkkeys-win32.c | 18 ++++++++++-------- gdk/win32/gdkmain-win32.c | 2 +- gdk/win32/gdkprivate-win32.h | 1 - gdk/win32/gdksurface-win32.h | 1 - gdk/win32/gdkwin32dnd-private.h | 2 ++ 17 files changed, 31 insertions(+), 27 deletions(-) diff --git a/gdk/win32/gdkclipboard-win32.c b/gdk/win32/gdkclipboard-win32.c index 87f83d1250..36d56b8b53 100644 --- a/gdk/win32/gdkclipboard-win32.c +++ b/gdk/win32/gdkclipboard-win32.c @@ -20,6 +20,7 @@ #include "gdkclipboardprivate.h" #include "gdkclipboard-win32.h" +#include "gdkdebug.h" #include "gdkintl.h" #include "gdkprivate-win32.h" #include "gdkhdataoutputstream-win32.h" diff --git a/gdk/win32/gdkclipdrop-win32.c b/gdk/win32/gdkclipdrop-win32.c index 2c3eab6d36..5fa826c261 100644 --- a/gdk/win32/gdkclipdrop-win32.c +++ b/gdk/win32/gdkclipdrop-win32.c @@ -273,18 +273,21 @@ Otherwise it's similar to how the clipboard works. Only the DnD server /* for CIDA */ #include +#include "gdkdebug.h" #include "gdkdisplay.h" #include "gdkprivate-win32.h" #include "gdkclipboardprivate.h" #include "gdkclipboard-win32.h" #include "gdkclipdrop-win32.h" #include "gdkhdataoutputstream-win32.h" -#include "gdk/gdkdragprivate.h" #include "gdkwin32dnd.h" #include "gdkwin32dnd-private.h" #include "gdkwin32.h" -#include "gdkintl.h" -#include "gdk-private.h" + +#include "gdk/gdkdebug.h" +#include "gdk/gdkdragprivate.h" +#include "gdk/gdkintl.h" +#include "gdk/gdk-private.h" #define HIDA_GetPIDLFolder(pida) (LPCITEMIDLIST)(((LPBYTE)pida)+(pida)->aoffset[0]) #define HIDA_GetPIDLItem(pida, i) (LPCITEMIDLIST)(((LPBYTE)pida)+(pida)->aoffset[i+1]) diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c index ad850a8a24..e5becd265f 100644 --- a/gdk/win32/gdkdevicemanager-win32.c +++ b/gdk/win32/gdkdevicemanager-win32.c @@ -29,6 +29,7 @@ #include "gdkdevice-win32.h" #include "gdkdevice-virtual.h" #include "gdkdevice-wintab.h" +#include "gdkeventsprivate.h" #include "gdkinput-winpointer.h" #include "gdkdisplayprivate.h" #include "gdkdisplay-win32.h" diff --git a/gdk/win32/gdkdisplaymanager-win32.c b/gdk/win32/gdkdisplaymanager-win32.c index ead0a49950..7fa2f18a55 100644 --- a/gdk/win32/gdkdisplaymanager-win32.c +++ b/gdk/win32/gdkdisplaymanager-win32.c @@ -24,7 +24,6 @@ #include "gdkprivate-win32.h" #include "gdkdisplaymanagerprivate.h" -#include "gdkinternals.h" struct _GdkWin32DisplayManager { diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c index 4482e1b3ad..27dedf916d 100644 --- a/gdk/win32/gdkdrag-win32.c +++ b/gdk/win32/gdkdrag-win32.c @@ -25,13 +25,17 @@ */ #include "config.h" -#include +#include "gdkwin32dnd.h" + +#include "gdkeventsprivate.h" +#include "gdkseatprivate.h" #include "gdk-private.h" -#include #include +#include #include +#include /* * Support for OLE-2 drag and drop added at Archaeopteryx Software, 2001 @@ -192,7 +196,6 @@ #define COBJMACROS #include "gdkdrag.h" -#include "gdkinternals.h" #include "gdkprivate-win32.h" #include "gdkwin32.h" #include "gdkwin32dnd.h" diff --git a/gdk/win32/gdkdrop-win32.c b/gdk/win32/gdkdrop-win32.c index d6e13a3d87..a4915537c1 100644 --- a/gdk/win32/gdkdrop-win32.c +++ b/gdk/win32/gdkdrop-win32.c @@ -42,7 +42,6 @@ #include "gdkdropprivate.h" #include "gdkdrag.h" -#include "gdkinternals.h" #include "gdkprivate-win32.h" #include "gdkwin32.h" #include "gdkwin32dnd.h" diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index a705ee7e2a..2576a6711d 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -47,12 +47,13 @@ #include #include "gdk.h" +#include "gdkdevicemanager-win32.h" #include "gdkdisplayprivate.h" +#include "gdkeventsprivate.h" +#include "gdkglcontext-win32.h" +#include "gdkkeysyms.h" #include "gdkmonitorprivate.h" #include "gdkwin32.h" -#include "gdkkeysyms.h" -#include "gdkglcontext-win32.h" -#include "gdkdevicemanager-win32.h" #include "gdkdisplay-win32.h" #include "gdkdeviceprivate.h" #include "gdkdevice-virtual.h" diff --git a/gdk/win32/gdkglcontext-win32-egl.c b/gdk/win32/gdkglcontext-win32-egl.c index 50f57ebe4f..0b30a8b481 100644 --- a/gdk/win32/gdkglcontext-win32-egl.c +++ b/gdk/win32/gdkglcontext-win32-egl.c @@ -35,7 +35,6 @@ #include "gdkglcontext.h" #include "gdksurface.h" -#include "gdkinternals.h" #include "gdkintl.h" #include diff --git a/gdk/win32/gdkglcontext-win32-wgl.c b/gdk/win32/gdkglcontext-win32-wgl.c index 31e0de7401..97f3b81356 100644 --- a/gdk/win32/gdkglcontext-win32-wgl.c +++ b/gdk/win32/gdkglcontext-win32-wgl.c @@ -35,7 +35,6 @@ #include "gdkglcontext.h" #include "gdkprofilerprivate.h" -#include "gdkinternals.h" #include "gdkintl.h" #include "gdksurface.h" diff --git a/gdk/win32/gdkglcontext-win32.c b/gdk/win32/gdkglcontext-win32.c index dea1a8d4fc..ec5c51789f 100644 --- a/gdk/win32/gdkglcontext-win32.c +++ b/gdk/win32/gdkglcontext-win32.c @@ -35,7 +35,6 @@ #include "gdkglcontext.h" #include "gdksurface.h" -#include "gdkinternals.h" #include "gdkintl.h" #include diff --git a/gdk/win32/gdkglcontext-win32.h b/gdk/win32/gdkglcontext-win32.h index f8ba71159f..5bb122d16e 100644 --- a/gdk/win32/gdkglcontext-win32.h +++ b/gdk/win32/gdkglcontext-win32.h @@ -31,7 +31,6 @@ #include "gdkglcontextprivate.h" #include "gdkdisplayprivate.h" #include "gdksurface.h" -#include "gdkinternals.h" G_BEGIN_DECLS diff --git a/gdk/win32/gdkhdataoutputstream-win32.c b/gdk/win32/gdkhdataoutputstream-win32.c index 95a57981f0..0075d0b66c 100644 --- a/gdk/win32/gdkhdataoutputstream-win32.c +++ b/gdk/win32/gdkhdataoutputstream-win32.c @@ -31,7 +31,6 @@ #include "gdkwin32display.h" #include "gdkwin32surface.h" -#include "gdkinternals.h" typedef struct _GdkWin32HDataOutputStreamPrivate GdkWin32HDataOutputStreamPrivate; diff --git a/gdk/win32/gdkkeys-win32.c b/gdk/win32/gdkkeys-win32.c index 981f52ab54..70d65e97fb 100644 --- a/gdk/win32/gdkkeys-win32.c +++ b/gdk/win32/gdkkeys-win32.c @@ -23,20 +23,22 @@ */ #include "config.h" -#include -#include -#include -#include -#include -#include +#include "gdkwin32keys.h" #include "gdk.h" #include "gdkprivate-win32.h" -#include "gdkinternals.h" +#include "gdkdebug.h" +#include "gdkdisplayprivate.h" #include "gdkkeysyms.h" #include "gdkkeysprivate.h" -#include "gdkwin32keys.h" + +#include +#include +#include +#include +#include +#include #define GDK_MOD2_MASK (1 << 4) diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c index cde3c789f1..1a52f706e5 100644 --- a/gdk/win32/gdkmain-win32.c +++ b/gdk/win32/gdkmain-win32.c @@ -32,8 +32,8 @@ #include #include "gdk.h" +#include "gdkdebug.h" #include "gdkkeysyms.h" -#include "gdkinternals.h" #include "gdkintl.h" #include "gdkprivate-win32.h" #include "gdkwin32.h" diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h index bd27cb5ef1..01d66f3073 100644 --- a/gdk/win32/gdkprivate-win32.h +++ b/gdk/win32/gdkprivate-win32.h @@ -34,7 +34,6 @@ #include //#include -#include "gdkinternals.h" #include "config.h" diff --git a/gdk/win32/gdksurface-win32.h b/gdk/win32/gdksurface-win32.h index 88a19f8018..293e58d4fc 100644 --- a/gdk/win32/gdksurface-win32.h +++ b/gdk/win32/gdksurface-win32.h @@ -30,7 +30,6 @@ #include "gdk/win32/gdkwin32surface.h" #include "gdk/gdksurfaceprivate.h" #include "gdk/gdkcursor.h" -#include "gdk/gdkinternals.h" #include diff --git a/gdk/win32/gdkwin32dnd-private.h b/gdk/win32/gdkwin32dnd-private.h index 2fab027b1d..a9c2d254fb 100644 --- a/gdk/win32/gdkwin32dnd-private.h +++ b/gdk/win32/gdkwin32dnd-private.h @@ -24,6 +24,8 @@ #include +#include "gdk/gdkdragprivate.h" + G_BEGIN_DECLS typedef struct _GdkWin32DragUtilityData GdkWin32DragUtilityData; -- 2.30.2